First commit on the new (not fucked up by git) version of the framework.