Added more module stuff and a new exception!