More work, start on frontend