Registration system added (Not fully functional)