no more rotating cogs ;( closes #35, closes #36