Cleanup, gonna get the most recent code in here