added new templates
savestate before restructuring
Version 0.0.3