Trying to Fix things and added a few useful methods