oh my.. still ripping out extra templates and horrible naming