Got basic functionality working again on front-end