Upgraded Rk-Core.
Slight refactor.
wip