Development improvements

No due date 68% complete