changes to own classes mainly (first commit - hope it works)