Changes!

added a lot of functonality