Moving to hiccup for ease (for now), changed imports, starting adding new views