Add proper logging and front end stuff