Restructured base objects to simplify inheritance
Added templating
templating added
Finished cleanong project.
Push merge to github