Moving towards being an actual app