Add some geespr stuff and CM building features