Fleshed out start of data management code