Sorted out some dependency issues here.... some