working on putting it all together