Got most of the under the hood stuff done.. Hopefully