cleanup/not wanting to add everything just yet
added most things