Big ol' update so I can work on this on my Desktop.