Marc: Nimbus complete but if i missed anything let me know