Moved code around
Some of the code inclusion, implementation and other things