Continued work on putting everything together