inherited classes not working
added some files + bugfixes