Some changes
Added some actual functionality