updated packages and now it's all broken yay
added packages based on Firefly sample
updating the code to match API changes
minor cleanup
inlining some usage and updating code to follow samples