Committing inital loader. A few know issues, but it works ok