Fixes #28 Daily

Moved some stuff