More functionallity working again