Base functionality now working, hoo rah