1st set of changes for my pwn personal computer. Not yet complete