Add secure api and what not
let's hold off on breaking the UI