Saving work
Comments will be on next commit
Working on conforming to new encoder