added basic stuff, more to come later