Stop in for a cup of coffee

Little more cleaning up done, still has a long way to go, but getting everything working.