Just to mirror whats already been said really.

Re-map (JGM), good panel filter as your starter and if you can push it, go de-cat. If you think you will go de-cat though, arrange this in conjunction with Simon (JGM) so that you can get the map done straight after.