Some basic changes to me

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