Removed some lower level stuff from main