Commit of main changes so far. Not production ready!