cog

fe9e0721 - Clean up implementation and ui issues