Knocked off a few TODO items, and added debugging help.
Simple astroid implementation.