First pass at reconfiguring for my own purposes