Moar updated

Fixes one part of issue #12, still have to fix the ID part.