Completed functionality

Just needs additional styling.