Storage/marker stuff

wrote storage stuff, version, stuff, marker stuff and minor fixes