Even more work on the manager, it's looking pretty good so far