Did a little more coding juggling around