Started to structure method calls, moved libraries, defines. Not executable at the moment