Started impementing fuctionality

Still needs work, see code