Initial commit, wip, need a copy on the macbook...