new features work. check out the attrs of these objs to see whats been added. cleaned up a bit.