Removed rest framework
Fixed merge conflicts. Hopefully.