Fixing bugs and starting to tie everything together.