debugged some more
bad pull
fixed merge conflicts
added inherited methods and attributes