Commit various helper classes

Not really functional yet