Added some mouse input framework and moved things around