Merging code into bay

Merges the previous code into baystation.