Working manager with new fields
Cleaned up from Mohammed's testing stuff