Merge the two!!!!

i got tired and seemed good enough to work under 1 branch.