Merged some more methods

..aaand work continues later.