Builder Pattern Round 2

Still not correct but putting online in case we need to access it