finished up the first version