Finalising some changes. READY to merge!