FINAL CLEANUP. THIS STUFF IS WORKING.