started on implementing saving/loading
merged changes