updated with new local version

added pretty much everything. think of this as an initial commit