added saving functionality, updated classes
remove tests