adding more things

still a mess but getting some structure