init commit, Needs some serious housekeeping