Added a lot more app logic!