Initial outlining, changing function headers
stuff
Basic architecutre