added basic stuff -ryan