This is kindof a lazy commit... some git stuff and some other stuff