Cleaned up, comments added, buttons do stuff now