Catching up on code

Creating a Pull request to get Crystal's code in my development2 branch.