Added strategy delegation, started work on movement