Finished pending spec and refactored
Fixed bug and added relative requires