Fleshed out classes and FileBuilder implementation