Refactoring + add some baby problems!