Completed OO design pattern on existing code. Now to flush it out more and have it grow.