Cleaned up the merge - moving to compiler warnings next...