Updated to latest

Did some work on the frontend