Adding working base implementation