started making it OO