Continue building out program structure get things working a bit better