Sorta implimenting missing system.
Merge pull request #173 from Clashnia/various

Sorta implimenting missing system.