Json serializing rebased

Please merge into master <3