Project @a_boshers phase 1...complete