completed tasks but want to organize better

will update git if it all goes well!