Starting to test things and fixing bugs