Some more lunchtime fiddlings, have my deck helper object and calculator now... also removed static concepts so I can write some tests