Cleaned up and working - no difficulty choice yet