Bug fix
Moved source code
Code compiles but it doesn't mean much.