All outstanding issues fixed, TODO: Add update, edit functions. Should be very simple.