addign some more components - still have a bit to tidy up :(