First commit of refactored Phasr (fixed)