removed uneeded files and rewrote some methods - pending