Modularized
Changed upper bound
trying to get test to work
Removed navbar. Added enter