Base work
Further work on base implementation