[WIP] VespolinaBilling issues