initial commit
cleaned up datastructures