stashing these in this branch, will come back to this later