Working on fully implementing things