Updates to function classes, element

Make everything work again