Some WIP work on an issue with fields not filling up correctly, continuing this on work PC