Updated roundhouse with more parameters
Initial updates from feedback via ferventcoder