app

My apologies for how late this is and as such I will be combining all 3 previous updates for the...