Removed test code

Shouldn't be there :)
Progress with modules

Didn't test anything, but should work