Added some things and did some other things. ALMOST WORKING?