Reorganizing
Added teabag for testing