Made things build correctly

Just modified files to make things build correctly. Probably will have
to heavily modify the code later to be able to merge things.