Commit
Commit
Finish with JSON parser

Finish with JSON parser. Fix assembly loading