Finished up converting these apps (with maybe a couple of bugs)