First commit

First Commit J3 branch, several changes.