added pretty much everything

almost done