Cleans deprecated functions
Cleans line functions
Adds serialization
Save & Load is functional
Merges with master