updated

main template almost finished