Updated the internals to be a bit more swifty
Further swiftifying.. now we're getting somewhere