Started to add inheritance

Still a little bit to work on