Finisched Structure
+ started adding better Controler