i think it's ready to go
some testing edits