Removing some b0rks
App framework almost there