Start moving towards templates and some bug fixes.