Wow... I've been taking a rather extended break from the porting (due to me needing to know more about coding before being able to go on), and today I find out someone else has already ported it to the 2x... Guess that saves me a lot of work...