Switched over to typeless system
Needs work