More Code...

Need to work on the setters/getters for data next. Once that's done I'll
be able to finish up this massive file.