Now with clean up done! This is pretty much final.