Initial Commit number 2, now with dirty hacks and pretty much no code! \o/