Updating the branch also would be much appreciated! :-)

Just porting all the existing apps *sigh* ;-)