Adding in executable, adding methods
Better error handling