Fixed some of the stuff in here - should work now!!!