Old Code merge

Add in all the old things