Quick commit
Fix merge conflict
Revised functions, pushing to Pi