Errors fixed, ready to start testing