Major update to start on actual project
Major updates that don't work