Basic functionality added, still needs views