added more stuff

compiles, haven't tried to run yet