Intial Commit 2, Almost Working

Need to write export functions. At the moment data has no where to go.