Implemented some more stuff, currently on props for E2