Starting to cleanup and piece things together