More work towards a proper applcation
More work towards a proper applcation