Start bringing things together. Add more testing