Code and init

Dont mean to annoy caktux, but imo a better solution than #32.