Added base, very dirty, work in progress