First Passing, but a bit of a mess
Added warning