First pass at integration with front-end