First commit of current code

Actually putting the code up might be helpful