Last push before mvp, everything should be working now