restored
fixed conflict
removed pyc
added stats
styles sort of set up