Basic functionality completed

Still missing real dictionaries though