Cleaned up some shit and changed autocode. Check the README for new naming conventions