Add history stuff
get rid of tabs...ughh
Fix merge conflict