checkpoint
checkpoint
checkpoint
move around views
extract each template into it's own file