views working, breaking into modules WIP