Inital Commit

Inital commmit. Many inconsistencies between old code and new design.
Chenges to be made soon.