Might need this...
Forgot some lines
General updates...
Fix some typos and more updates
Add template common files etc...