Added first two tools (all code reused from previous projects)