Swapped out basic code for compartmentalized architecture