Calling this done. It could be better, but I want to move onto something else. #b3d