organizing into actual thing
added some things