Now testing *before* committing... this is some ass ugly code tho