Working out the final touches still. Runs but not functioning correctly