Made major changes to method names. Shorter and better.