Finished assignment, might pretty it up more later, but all the content is there