implemented more stuff.