Ernie

We have some merge conflicts i think its the git ignore :/ but double check and i can help you merge it on tuesday if you want