more stuff

1st part almost done