Testing Coda again?
Moved some code around