Fixing some stuff

Adds some functions back probably without breaking things