Working on code efficiency and style a bit. Also beginning to add GE implementation.