Skeleton working, converting over old functionality

Nearly there.