Changed lots of things again...sorta buggy...uploading to have for next class.