added TODO
even more TODO
Added pattern to Scanner s