Made more user friendly, and working.