Clean up codebase, code and add stacking

+ Cleaned code
+ Cleaned depricated code
+ Added stacking of objects