Added the basics, still thinking what to add