Finished backend, a couple of front end tweaks left