cleanup
first draft of templateo