Add __init__ and convert some methods to static
Rearrange some deck chairs