Secondary commit - integrated fbp, need further fixes and improved gui