Minor progress. :(