Adding in some basic bits in