Some basic changes to me, #1

I think this creates another version (branch) of the original amirite?