major commit, rearranged loads of things, started working with face recognition for e-cig insertion