Fixed stupid import errors
Full vertical slice
About to merge website
Website merged
Some more code