Fixed stuff and got back to this project