Cleanup, basic outline working.