added in a bunch of basics