Did stuff
Went with Tyler's commits